Hello @mattlord, there are conflicts in this backport.

Please address them in order to merge this Pull Request. You can execute the snippet below to reset your branch and resolve the conflict manually.

Make sure you replace origin by the name of the vitessio/vitess remote

git fetch --all
gh pr checkout 15583 -R vitessio/vitess
git reset --hard origin/release-18.0
git cherry-pick -m 1 df1285ca4c695e6e349d70202abbfe65725fcce0

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

• Ensure that the Pull Request has a descriptive title.
• Ensure there is a link to an issue (except for internal cleanup and flaky test fixes), new features should have an RFC that documents use cases and test cases.

Tests

• Bug fixes should have at least one unit or end-to-end test, enhancement and new features should have a sufficient number of tests.

Documentation

• Apply the release notes (needs details) label if users need to know about this change.
• New features should be documented.
• There should be some code comments as to why things are implemented the way they are.
• There should be a comment at the top of each new or modified test to explain what the test does.

New flags

• Is this flag really necessary?
• Flag names must be clear and intuitive, use dashes (-), and have a clear help text.

If a workflow is added or modified:

• Each item in Jobs should be named in order to mark it as required.
• If the workflow needs to be marked as required, the maintainer team must be notified.

Backward compatibility

• Protobuf changes should be wire-compatible.
• Changes to _vt tables and RPCs need to be backward compatible.
• RPC changes should be compatible with vitess-operator
• If a flag is removed, then it should also be removed from vitess-operator and arewefastyet, if used there.
• vtctl command output order should be stable and awk-able.

I can't understand why these changes are needed without an issue that describes the bugs you found and are trying to fix.
Especially because we are backporting, it will be good to document the specific error/bug. I understand that some of the changes are for tests which is fine, we just need to call the actual production bug out.
While the commentary on the original PR is helpful in understanding how it came about, it should be amended with a link to the issue as well. Since that has already been merged I attached the description label to this PR instead.

I can't understand why these changes are needed without an issue that describes the bugs you found and are trying to fix.
Especially because we are backporting, it will be good to document the specific error/bug. I understand that some of the changes are for tests which is fine, we just need to call the actual production bug out.
While the commentary on the original PR is helpful in understanding how it came about, it should be amended with a link to the issue as well. Since that has already been merged I attached the description label to this PR instead.

Yeah, it's a bit odd. Sorry about that. I'll create 1 or 2 issues and link them in all of the related PRs, including this one. There were two general bugs, both related to switchReads:

1. The --cells flag value was not getting passed through which is needed when switching reads in a subset of cells
   • When the cells value in the request was empty, we were using the cells specified in the workflow Create (used for selecting tablets) — when it should remain empty (meaning switch reads in all cells)
2. For switchShardReads were were incorrectly managing the direction and its relationship to the source and target — when the source and target, based on the direction, are already setup when building the traffic switcher in the vtctldclient implementation — and thus SwitchTraffic/ReverseTraffic for Reshard did not work correctly

The other things were minor changes/improvements related to the code during the investigation. But these were pretty significant vtctldclient only bugs and I wanted to get them fixed ASAP, and also why it was important to follow through and increase the e2e testing of the vtctldclient implementation.